Auto merge of #3952 - jessicah:haiku-support, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Apr 2017 05:36:08 +0000 (05:36 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Apr 2017 05:36:08 +0000 (05:36 +0000)
Haiku support


Trivial merge